bitkeeper revision 1.1243 (4225f63a_DvywTD0qmXez00zLLTU9Q)
authorrneugeba@wyvis.research.intel-research.net <rneugeba@wyvis.research.intel-research.net>
Wed, 2 Mar 2005 17:22:02 +0000 (17:22 +0000)
committerrneugeba@wyvis.research.intel-research.net <rneugeba@wyvis.research.intel-research.net>
Wed, 2 Mar 2005 17:22:02 +0000 (17:22 +0000)
commit3398fe73aafccd5918e2c12c52d9a1222fe8261f
tree8fb0016966d26c3e75c141f5b6e5bb6143071fd6
parent3bd36ccc5027936810134b3b0ddbf7aebdf73d58
parentd9edb54d671cf60004821d4856c7a01cc46ad92b
bitkeeper revision 1.1243 (4225f63a_DvywTD0qmXez00zLLTU9Q)

manual merge

Signed-off-by: michael.fetterman@cl.cam.ac.uk
tools/libxc/xc.h
xen/arch/x86/x86_32/asm-offsets.c